Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 03:59:53 +0000 (03:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 03:59:53 +0000 (03:59 +0000)

Trivial merge